Win32 build: Fix #700 - Can't save document

synfig · Jan 7, 2015 · ddbebef · ddbebef
1 parent e85add6
commit ddbebef
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/autobuild/fedora-crosscompile-win.sh b/autobuild/fedora-crosscompile-win.sh
@@ -74,6 +74,7 @@ if [ -z $NOSU ]; then
 		libtool \
 		libtool-ltdl-devel \
 		${TOOLCHAIN}-gcc-c++ \
+		${TOOLCHAIN}-cpp \
 		${TOOLCHAIN}-libxml++ \
 		${TOOLCHAIN}-cairo \
 		${TOOLCHAIN}-pango \
@@ -180,6 +181,8 @@ done
 [ -d ${PREFIX}/share ] || mkdir -p ${PREFIX}/share
 for file in \
    fontconfig \
+   glib-2.0 \
+   gtk-3.0 \
    themes \
    xml \
 # this extra line is required!
@@ -614,14 +617,12 @@ gen_list_nsh bin bin
 sed -i '/ffmpeg\.exe/d' bin.nsh		# exclude ffmpeg from he list of binaries - it will go into separate group
 gen_list_nsh etc etc
 gen_list_nsh examples examples
-gen_list_nsh lib/gtk-2.0 lib-gtk
+gen_list_nsh lib/gdk-pixbuf-2.0 lib-gdk-pixbuf
+gen_list_nsh lib/gtk-3.0 lib-gtk
 gen_list_nsh lib/synfig lib-synfig
 gen_list_nsh licenses licenses
 #gen_list_nsh python python # -- takes too long
-gen_list_nsh share/locale share-locale
-gen_list_nsh share/pixmaps share-pixmaps
-gen_list_nsh share/synfig share-synfig
-gen_list_nsh share/themes share-themes
+gen_list_nsh share share
 
 cp -f $SCRIPTPATH/synfigstudio.nsi $PREFIX/synfigstudio.nsi
 sed -i "s/@VERSION@/$VERSION/g" $PREFIX/synfigstudio.nsi

diff --git a/autobuild/synfigstudio-cygwin-mingw-build.sh b/autobuild/synfigstudio-cygwin-mingw-build.sh
@@ -963,14 +963,12 @@ gen_list_nsh bin bin
 sed -i '/ffmpeg\.exe/d' bin.nsh		# exclude ffmpeg from the list of binaries - it will go into separate group
 gen_list_nsh etc etc
 gen_list_nsh examples examples
+gen_list_nsh lib/gdk-pixbuf-2.0 lib-gdk-pixbuf
 gen_list_nsh lib/gtk-3.0 lib-gtk
 gen_list_nsh lib/synfig lib-synfig
 gen_list_nsh licenses licenses
 #gen_list_nsh python python # -- takes too long
-gen_list_nsh share/locale share-locale
-gen_list_nsh share/pixmaps share-pixmaps
-gen_list_nsh share/synfig share-synfig
-gen_list_nsh share/themes share-themes
+gen_list_nsh share share
 
 
 #make installer

diff --git a/autobuild/synfigstudio.nsi b/autobuild/synfigstudio.nsi
@@ -64,20 +64,20 @@ Section "Synfig Studio"
   !include "etc.nsh"
 
   SetOutPath "$INSTDIR\lib"
+  !include "lib-gdk-pixbuf.nsh"
   !include "lib-gtk.nsh"
   !include "lib-synfig.nsh"
 
   SetOutPath "$INSTDIR\licenses"
   !include "licenses.nsh"
+
+  SetOutPath "$INSTDIR\share"
+  !include "share.nsh"
 
   ;SetOutPath "$INSTDIR\python"
   ;!include "python.nsh"
   SetOutPath "$INSTDIR"
   File /r /x .* python
-
-  !include "share-pixmaps.nsh"
-  !include "share-synfig.nsh"
-  !include "share-themes.nsh"
 
 IfFileExists $PROFILE\.gtkrc-2.0 GtkrcExists PastGtkrcCheck
 GtkrcExists: